More refactor and cutting the fat