Maven, JUnit, Simplifications, Code Cleanup