bring more code up to coding standards