Cleaned up the Cakefile