DataReader does not maintain state, so there's no need to keep an instance of it

Some other minor fixes and style updates as well.