Reformarting and cleaning imports