Improved javadoc and parameter naming