Javadoc and code reformatting
Use constants for import parameter names