code/comment housekeeping