Cleaning up namespace usage to use 'use' statements