updated code to standards
Merge branch 'release/feature-standards'