Cleaned up efp calls a bit