Changed the standards to follow the PSR-0