Cakefile refactor