Modified spaces to meet the PEP style