Refactored a little more.