Cleanup & Formatting
Removed redundant Javadoc from Getters/Setters