+ More refactoring woo