More refactor fun!