Swing refactoring continued