Remove one 'that'
Add stupid javadocs