Reorganizing some utility functions