How to clean up my code