Formatting and some comments