diff --git a/src/main/java/com/spotify/reaper/storage/CassandraStorage.java b/src/main/java/com/spotify/reaper/storage/CassandraStorage.java
index 62b7bbbc5..f671ef556 100644
--- a/src/main/java/com/spotify/reaper/storage/CassandraStorage.java
+++ b/src/main/java/com/spotify/reaper/storage/CassandraStorage.java
@@ -60,7 +60,10 @@ public final class CassandraStorage implements IStorage {
   Session session;
 
   /* Simple statements */
-  private final String getClustersStmt = "SELECT * FROM cluster";
+  private static final String SELECT_CLUSTER = "SELECT * FROM cluster";
+  private static final String SELECT_REPAIR_SCHEDULE = "SELECT * FROM repair_schedule_v1";
+  private static final String SELECT_REPAIR_UNIT = "SELECT * FROM repair_unit_v1";
+  private static final String SELECT_REPAIR_RUN = "SELECT * FROM repair_run";
 
   /* prepared statements */
   private PreparedStatement insertClusterPrepStmt;
@@ -141,7 +144,7 @@ public boolean isStorageConnected() {
   @Override
   public Collection<Cluster> getClusters() {
     Collection<Cluster> clusters = Lists.<Cluster>newArrayList();
-    ResultSet clusterResults = session.execute(getClustersStmt);
+    ResultSet clusterResults = session.execute(SELECT_CLUSTER);
     for(Row cluster:clusterResults){
       clusters.add(new Cluster(cluster.getString("name"), cluster.getString("partitioner"), cluster.getSet("seed_hosts", String.class)));
     }
@@ -318,7 +321,7 @@ public Collection<RepairRun> getRepairRunsWithState(RunState runState) {
     // There shouldn't be many repair runs, so we'll brute force this one
     // We'll switch to 2i if performance sucks IRL
     Collection<RepairRun> repairRuns = Lists.<RepairRun>newArrayList();
-    ResultSet repairRunResults = session.execute("SELECT * FROM repair_run");
+    ResultSet repairRunResults = session.execute(SELECT_REPAIR_RUN);
     for(Row repairRun:repairRunResults){
       if(RunState.valueOf(repairRun.getString("state")).equals(runState)){
         repairRuns.add(buildRepairRunFromRow(repairRun, repairRun.getUUID("id")));
@@ -360,7 +363,7 @@ public Optional<RepairUnit> getRepairUnit(UUID id) {
   public Optional<RepairUnit> getRepairUnit(String cluster, String keyspace, Set<String> columnFamilyNames) {
     // brute force again
     RepairUnit repairUnit=null;
-    ResultSet results = session.execute("SELECT * FROM repair_unit_v1");
+    ResultSet results = session.execute(SELECT_REPAIR_UNIT);
     for(Row repairUnitRow:results){
       if(repairUnitRow.getString("cluster_name").equals(cluster)
           && repairUnitRow.getString("keyspace_name").equals(keyspace)
@@ -608,7 +611,7 @@ public Collection<RepairSchedule> getRepairSchedulesForClusterAndKeyspace(String
   @Override
   public Collection<RepairSchedule> getAllRepairSchedules() {
     Collection<RepairSchedule> schedules = Lists.<RepairSchedule>newArrayList();
-    ResultSet scheduleResults = session.execute("SELECT * FROM repair_schedule_v1");
+    ResultSet scheduleResults = session.execute(SELECT_REPAIR_SCHEDULE);
     for(Row scheduleRow:scheduleResults){
       schedules.add(createRepairScheduleFromRow(scheduleRow));
     }