diff --git a/src/JSedFrame.java b/src/JSedFrame.java
index 62d5661..2d0eea7 100644
--- a/src/JSedFrame.java
+++ b/src/JSedFrame.java
@@ -3,19 +3,8 @@
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.io.File;
-import java.util.List;
 import java.util.Vector;
-
-import javax.swing.JButton;
-import javax.swing.JFileChooser;
-import javax.swing.JFrame;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JSplitPane;
-import javax.swing.JTable;
-import javax.swing.JTextArea;
-import javax.swing.SwingUtilities;
+import javax.swing.*;
 import javax.swing.table.DefaultTableModel;
 
 
@@ -197,7 +186,7 @@
 		
 		Vector<Vector<String>> v = expressionTableModel.getDataVector();
 		for (Vector<String> row : v) {
-			if(!row.elementAt(0).equals("")) {
+			if(!row.elementAt(0).isEmpty()) {
 				String search = row.elementAt(0);
 				String replace = row.elementAt(1);
 				data = JSedUtils.performReplace(data, search, replace);
@@ -382,7 +371,7 @@
 
 	@SuppressWarnings("unchecked")
 	protected void save() {
-		StringBuffer data = new StringBuffer();
+		StringBuilder data = new StringBuilder();
 		Vector<Vector<String>> v = expressionTableModel.getDataVector();
 		for (Vector<String> row : v) {
 			data.append("\"");
@@ -395,7 +384,7 @@
 		
 		JFileChooser jfc = new JFileChooser();
 		int result = jfc.showSaveDialog(this);
-		if(result==jfc.APPROVE_OPTION) {
+		if(result==JFileChooser.APPROVE_OPTION) {
 			File f = jfc.getSelectedFile();
 			if(f.exists()) {
 				int confirm = JOptionPane.showConfirmDialog(this, "Overwrite existing file?");