Style pass for @madbook

Addresses most of https://gist.github.com/madbook/b938a171e54413a69f66

:eyeglasses: @madbook