namespacing and making some variable names more intelligible