Cleared some of my comments. See the previous commit if you want to read those.