Cleaned code and updated Makefile.