More refactorize!