More cleanup, enable italic comments