STYLE cleanup here and there