working on cleaning up my code