More refactor!!!