Major cleanup - Preparation for v1.0