Clean up class name & minor wibbles.