cleaning up class part 1