Formatting and comments added