Code cleanup
Slight change to how upload functions are accessed