replaced states with space-less state labels