refactored vars to better names