updated maven dependencies + cleaned code