Refactored a little.