Improve Cakefile