Code cleanup.

Added some TODOs to introduce SwingWorker threads.