improve aws cpi code quality
Merge pull request #188 from pmenglund/aws_cpi_cleanup

improve aws cpi code quality