STY: Minor cleanups