Huge code gardening