Using RSpec 'expect' syntax + cleaning code