Change function definition regex to match return value as storage