Cleaning up Goofy-code