Updated Javadoc comments and code spacing