More formatting and organize all imports