Merge "Optimizing Imports and Formatting code"