Tidy the PSOC a bit