small refactoring
Good news! Now we don't have to compact the screen.

Bad news, now there's a -800 somewhere and I have no idea why!