Use same class declaration style for controls