Simplified returned statement.
Fixed javadoc.