clean up my code