refactoring prefixes and suffixes and updating comments
fixing linting errors