adding support for AWS and minor formatting changes