I know that I've been complaining for indentation a lot, but way of doing things (which is I was told to follow) does really read well. I think we should indent like this

http://codeshare.io/aexd5