Re-ording and removing a function that wasn't needed