STY: Various cleanups