Fixed Indentation 
Added Javadoc