Comments, restructure a little bit.