Fixed Indentation 
Added Javadoc
JavaDoc