Improvement: refactor