Fix coding style to classes