cleanup, move stuff around, make class name more consistent and easy to discover