trying to change the source code to psr standard