Correct comment
Minor refactor of util functions