Make class declarations consistent