Fixing more spaces and lines