changed variables to use proper naming conventions