update/add comments for readability