small uniformisation of the classes declaration