Cleaned up java code a bit in build / make system