Groundskeeping, refactoring