fixed psr2 standard issues