Conform to psr2 standards