Updated util functions following style guide.