Fixed some of the suggestions by @houndci