refactor: improved code quality