Comments and code formatting