Refactoring Cakefile