Formatting and General Updates
Updates to code: Cleaned up some code.
Update pom.xml