Application done - formatting and makefile left
Cleaned up java files