Cleanup and class renaming