Refactoed.