Improve documentation, fiddle with class names