More comments
Reduce visibility
Removed unneeded calls
Removed unneeded javadoc