Edited comments for readability