Fixing checkstyle
Fixed PSR2 standard violations