Processed code review. Fixed checkstyle errors