Minor refactor.
Most of Swing implementation.