Making style more consistent with * and & placement
renamed a variable and a function