Minor Edit to functions