Use maven libraries where possible and fix a few missed formattings.