Since you're changing those declarations, move the class opening { to a separate line, as per coding guidelines (here and in the files below)