Code clean-up; class and method renaming