Really cleaned up structure.