stylistic refactorings
w/ less syntactic sugar
Merge pull request #1089 from budnik/minor_refactorings

Some refactorings