Code formatting and comment update