Address review comments by adding javadocs and a finally-clause.