naming conventions changed, minor clean-up