cleaned up dependencies in pom, also did some reformatting in the source...

... code files.