Some style clean-up.