rename vars and methods to make more sense