Formatting and added comments