Clarify some Javadoc and rename some parameters to be more self-documenting