Improved method references.
Fixed braces in Javadoc.
Added closing curly brace.
Removed unused throws declarations; Javadoc fixes.