Autodoc, Clean up code conventions

Added autogenerated javadocs (need actual comments)
Began cleaning up the code to a standard, consistant style