slight refactor
slight refactor

genome/civic-server,genome/civic-server,genome/civic-server,genome/civic-server,ahwagner/civic-server,genome/civic-server,ahwagner/civic-server,ahwagner/civic-server,ahwagner/civic-server