Code cleanup, class renamed, some more documentation