further style cleanup