formatting and some comments