Sloppy seconds cleanup

STANDARD - 21,421   GOLD - 7,835