Cakefile simplified