Reformatted code and optimized imports