cleaning up make flow