cleaned up a bit, +screen