cakefile simplified a  bit