Cleaning up the cakefile