Make all the things more object-oriented