Tweaked inline comments
Added first and last name helpers