Comments and var renames