fixed psr2 standard issues
fixed psr2 standard issues