Refactor - Improve a bit