More refacttoring