Reformatted and added todos