Update comments with checks