Slight refactor of 2aec948 and fix code formatting
Slight refactor of 2aec948 and fix code formatting

michaelerobertsjr/keystone,everisARQ/keystone,alobodig/keystone,matthieugayon/keystone,danielmahon/keystone,frontyard/keystone,dvdcastro/keystone,matthewstyers/keystone,w01fgang/keystone,dvdcastro/keystone,sendyhalim/keystone,michaelerobertsjr/keystone,snowkeeper/keystone,dryna/keystone-twoje-urodziny,dryna/keystone-twoje-urodziny,pr1ntr/keystone,andrewlinfoot/keystone,w01fgang/keystone,rafmsou/keystone,concoursbyappointment/keystoneRedux,brianjd/keystone,trentmillar/keystone,xyzteam2016/keystone,matthewstyers/keystone,everisARQ/keystone,Pop-Code/keystone,Adam14Four/keystone,frontyard/keystone,jacargentina/keystone,naustudio/keystone,vokal/keystone,danielmahon/keystone,vokal/keystone,jstockwin/keystone,concoursbyappointment/keystoneRedux,Adam14Four/keystone,xyzteam2016/keystone,frontyard/keystone,naustudio/keystone,brianjd/keystone,linhanyang/keystone,Yaska/keystone,benkroeger/keystone,jacargentina/keystone,matthewstyers/keystone,danielmahon/keystone,benkroeger/keystone,matthieugayon/keystone,benkroeger/keystone,alobodig/keystone,trentmillar/keystone,trentmillar/keystone,webteckie/keystone,sendyhalim/keystone,andrewlinfoot/keystone,vokal/keystone,rafmsou/keystone,naustudio/keystone,cermati/keystone,Yaska/keystone,snowkeeper/keystone,andrewlinfoot/keystone,jstockwin/keystone,Pop-Code/keystone,Yaska/keystone,pr1ntr/keystone,ONode/keystone,cermati/keystone,ratecity/keystone,ratecity/keystone,ONode/keystone,webteckie/keystone