Updated JavaDoc and changed internal parameters for clarification