Thing reviewed and refactored.