Fix tabs and remove superfluous state