renaming and small refactor