stylistic changes, more consolidation
fixed merge conflict