Cleaned up Swing file after merge and rebasing.