More messing around and cleaning up.