improve aws cpi code quality