Minor refactoring.Got rid of unnecessary classes