Fixed class declaration double-up