Code Formatting and import optimization