cleaned up crufty language