fixed psr2 violations