Cleaned up, added few more comments
added simulateData to makefile