Take care of coding standards