Organize imports and various cleanups
4 files changed