Organize imports and comments