Make more object-oriented