Formatted and added comments