PSR-2 refactor

changed the style with PHPStorm to make it standard