cleaned up classes
lambda
renumbering
renumbering