Fixed Checkstyle Errors for first 3 classes