cleanup
cleanup whitespace
cleanup makefiles