#12 refactor bakefile