STY: Minor cleanup