cleaned up a bit or two