- a bit more cleaning up