Cleaned up code and wrote a very simple Makefile because Im lazy