Simple fix, irritating problem. Also slight cleanup apparently.