Reformating and optimizing imports