Rehashed/cleaned up/organized.