Merge "Organize imports and fix formatting"