starting to clean up my mess