Code cleanup
Improve cleanup dialog look