Refactored work a little smoother out of the box.