Applied more suggestions from Craig.