improve PSR2 code style