Spaces and tabulations fix