refactoring
psr-2 changes
added test
refactoring
refactoring