Reformatting and documentation