1. Code cleanup
2. Replace old signal/slot syntax.
Move methods