Infill refactoring and cleanup complete