Cleaned some classes