Added missing Javadoc and refractored some variable names
Removed unecessary constants