Fix indentation and upgrade to latest AMIs