Small style clean-up