Begun refactoring.
refactoring, ructoring.