Improved output
Javadoc