Refactor callbacks return null