stylistic choices for easy read
more style and refactoring
more refactoring/style changes. Only nmd to go.