Cleanup
more cleanup
makefile. main file to modularize functionality