More refactoring sway out