Refactor

Committing refactor changes for spaces and cleanliness (it's next to
Godliness).