Improved Javadoc; fixed checkstyle issues; cosmetic code improvements;