Updated some comments for readability