Updated comments for readability