Made variable names 'more appropriate'