Variable renamed(Code refactoring)

Javadoc style also applied