housecleaning: gave some variables more descriptive names