use spaces for indentation
More cleanup

* Adding overrides
* Small bit of refactoring in NIOService