More refactoring adventures | Heykuki News