Trying to clean up my mess