bit by bit cleaning up the mess