renamed few poorly named vars