Cleaning up AmazonBanner class