OO-ness and making it simpler