refactor: Improvements