Use Customer instead of User.
Fix typos and clean things up.