Asst. style fixes