updated with checkstyle-guided improvements.