Some more refactoring and added a convenience initializer for Tire