work on coding standards compliance