Refactoring leftovers