Cleaning up manage columns dialog code