System reviewed and refactored.