Style cleanup, more object-oriented-like
More object-oriented-like, like previous commit
Further cleanup