Made comments match current code