Ident and remove warnings