Basic format and import cleanup.
Fixed things up a bit. Code now integrates into the project a bit
better.