refactor psfi's