Improve method and variable  names