initial PSR-2 changes

not done