Post #1471733

@natecox I tried to fix it. Rearranged things a little. Hopefully it's Ok now. I'll pay more attention to these, they can become annoying.