Updates PCF to 4x4, cleans up PCF code