Removed CPF flag, whitespace clean