Code edits + comment