cleanup

and some class renaming