Fix a "!" and some cleanup