Code cleanup and About Dialog