Optimized import and reformatted code