Started removing cruft, moving towards OOP