Optimized imports and reformatted file headers and comments