Fixing Checkstyles Issues