cleanup
variable names cleanup to match coding standard