reformatted code and optimized imports