amount -> Amount
minor tweaks