Minor fixes

- Removed author javadoc
- Replace Anon. class with Lambda expr.
- Reformatted source code
- Merged catch clauses