PEP and space small fixes