[FEATURE] Fixed PSR-2 checkstyle errors