Clean up class part 2