Cleaned up some utility function inputs