New MaxFrameHandler class...
More cleaning.
more renaming