Reformatte and clean up