Refactroring...