Clean up whitespace
Fix memory leak

Closes issue #1
Fix naming error in Makefile