Styling changes and rspec tests adjusted