Update! Day 2 of the move and I've cleaned up and taken your advice. Still needs some work but I'm pleased.