Cleaning up imports and function names