Add Javadoc and optimize code