Javadoc updated and remove empty lines