Cleaning up util functions