cleaned up a bit more