Added proper return types to utility scripts