Add untested comment additions

Untested because it also includes variable declarations for
readability.