Small JavaDoc changes
Small code readability/format changes
More small code readability changes