Finished streamlining function imports