better piping
cleanup variable names and pipes