Reformatted source code and optmized imports