Ek feedback

Nice job!

I went through some refactorings which you can find in the commits listed below. I reading through each commit to get the most out of this review. 

For each commit you'll see a small change set along with an explanation of what I was thinking when making that set of changes.

Let me know if you have questions about any of the changes in these commits.

**Don't merge this pull request into your repository.**