Feature/fix remarks from review

https://twitter.com/jy/status/479252400742871040 and https://twitter.com/Horse_iOS/status/478690729678479360 :)