updated to coding standards