Re-formatted and updated comments