Reformatting, preparing to minimize code