Use diamond operand
Added Javadoc to private and protected methods