Seems good. I'll add some comments about the formating