More tab/spaces corrections