Correct indentation (again) and added amd support