Starting to clean up code (making a mess)