WIP: PEP and refactor
More PEP