remove superfluous 'done' object and uppercase class names