Updated all maven repositories and dependencies to 1.5.2
Cleaned up formatting of a few files along with slight code tweaks.