cleaning up my code