Refactoring many things