Refactored things.