Reformating code and optimizing imports