I went in yesterday to clean up the room some more. The photo doesn't show it, but the rug is badly in need of cleaning as is the linoleum floor.
The janitor has left the floor cleaning equipment in my room, and I think he'll get to my room over the weekend. Once that's done, I have just a day or two of work cleaning off the counters before delving into curricular planning.
Cubbies are in a new place in the room. I think this arrangement will help the room look neater by keeping the messes more self contained. Also the semi-enclosed space provides a bit of a refuge.