Clean up and add prototype
Edited Makefile