Updated mvn dependencies and cleaned up code