Added Javadoc and limited lines to 80 characters