fix variable names and collect inputs place