Adding overdue comments for readability