Improve: small refactor