Refactor improvement