Update javadoc
Refactor to follow common layout (prepare for duplicate code extraction
into parent class)
Refactor into common layout (in preparation for duplicate code
extraction into parent class)
Refactor into common layout (in preparation for duplicate code
extraction into parent class)
Refactor into common layout (in preparation for duplicate code
extraction into parent class)
Refactor into common layout (in preparation for duplicate code
extraction into parent class)