Adjusted formatting and fixed comments