Fixes style issues from RSpec & Pull Review