code cleanup (method renaming, etc)