Cleanup

Mostly JavaDoc and one redundant try-catch block.