diff --git a/GemCity.rb b/GemCity.rb
deleted file mode 100644
index 690dc84..0000000
--- a/GemCity.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-class GemCity
-
-=begin
-This class represents the town of GemCity
-This is a town riddled with crime but we can find out how happy the town is
-=end
-  def initialize
-    @people, @population = {
-     :thieves => 5, 
-       :Officers => 1},
-       50
-    end
-
-  def thieves thieves_number=@people[:thieves]
-     return @people[:thieves] = thieves_number
-  end
-
-  def officers
-    return @people[:Officers] 
-  end
-
-  def population; return @population; end
-
-  def setOfficers officers
-    @people[:Officers] = officers
-  end
-
-  def happiness_of_town
-    #happiness is random... people don't know what they want!
-    happinessVals = Array.new
-     happiness = 0
-    for index in (1..@population)
-      happinessVals.push(rand((100 - successful_crime_rate) .. 100))
-      index += 1
-    end
-    happinessVals.each do |value|
-      happiness += value
-    end
-    return happiness / 100
-  end
-
-  def successful_crime_rate
-    thieves = @people[:thieves]
-    officers = @people[:Officers]
-    if thieves <= 0
-      odds_percent = 0
-    elsif officers > thieves
-      odds_percent = 0
-    else
-      odds = 1 \
-       - officers.to_f / thieves.to_f
-      odds_percent = odds * 100
-    end
-    return odds_percent
-  end
-end
\ No newline at end of file
diff --git a/Gemfile b/Gemfile
index 94b6f8c..6fd63b3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
 gem 'rubocop', require: false
-gem 'rspec'
\ No newline at end of file
+gem 'rspec'
diff --git a/gem_city.rb b/gem_city.rb
new file mode 100644
index 0000000..582f3ff
--- /dev/null
+++ b/gem_city.rb
@@ -0,0 +1,43 @@
+# This class represents the town of GemCity
+# This is a town riddled with crime but we can find out how happy the town is
+class GemCity
+  attr_reader :population
+
+  def initialize
+    @people = { thieves: 5, officers: 1 }
+    @population =   50
+  end
+
+  def thieves(thieves_number = @people[:thieves])
+    @people[:thieves] = thieves_number
+  end
+
+  def officers(officers_number = @people[:officers])
+    @people[:officers] = officers_number
+  end
+
+  def happiness_of_town
+    # happiness is random... people don't know what they want!
+    happiness_vals = []
+    happiness = 0
+    (1..@population).each do
+      happiness_vals.push(rand((100 - successful_crime_rate)..100))
+    end
+    happiness_vals.each do |value|
+      happiness += value
+    end
+    happiness / 100
+  end
+
+  def successful_crime_rate
+    thieves = @people[:thieves]
+    officers = @people[:officers]
+    if thieves <= 0 || officers > thieves
+      odds_percent = 0
+    else
+      odds = 1 - officers.to_f / thieves.to_f
+      odds_percent = odds * 100
+    end
+    odds_percent
+  end
+end
diff --git a/gem_city_spec.rb b/gem_city_spec.rb
index 884b3cb..d5d0f67 100644
--- a/gem_city_spec.rb
+++ b/gem_city_spec.rb
@@ -1,7 +1,7 @@
 require 'rspec'
-require_relative 'GemCity' # This line may need to be changed
+require_relative 'gem_city.rb' # This line may need to be changed
 
-describe 'Gem City' do
+describe 'GemCity' do
   let(:city) { GemCity.new }
   it 'Initialize City' do
     expect(city.thieves).to eq(5)
@@ -15,8 +15,9 @@
     end
 
     it 'officers = thieves' do
-      city.thieves 1
-      city.setOfficers 1 # This line may need to be changed
+      city.thieves(1)
+
+      city.officers 1 # This line may need to be changed
       expect(city.successful_crime_rate).to eq(0)
     end
 
@@ -27,7 +28,7 @@
 
     it 'officers > thieves' do
       city.thieves 1
-      city.setOfficers 2 # This line may need to be changed
+      city.officers 2 # This line may need to be changed
       expect(city.successful_crime_rate).to eq(0)
     end
   end
@@ -38,7 +39,7 @@
     end
 
     it 'successful_crime_rate = 0' do
-      city.thieves 0
+      city.thieves(0)
       expect(city.happiness_of_town).to eq(50)
     end
   end