Changed position of 'object' in class definitions