tidy up code and maven dependencies