standardize logic blocks
Merge pull request #2259 from eddiemonge/patch-1

standardize logic blocks