28: Cleanup/refactor