Code refactor to bring up to open source contrib coding standards
code refactor