Closes 136 137 138 139 142
Merge pull request #34 from devs-for-change/aw/style-work

Closes 136 137 138 139 142