Remove redundant class modifier
Remove redundant modifier
Minor
Make groovier
Improve doc.
Use short-circuit OR.
Minor
Minor
More Javadoc.