Formatting and more comments