Cleaning!

Bigger cleaning to be done tomorrow (well, later today)