Add state names as comments