refactoring: renaming identifiers and restructuring workflow