Update PSR-2 standards to suit OOTS team

Adopted PSR-2 standards and made changes to suit OOTS team