StyleCop cleanup
only use Self for internal self references
avoid additional layers of abstraction