tiny clean-up & method renaming