Finished Rspec code refactoring. Added comments. Better structuration