diff --git a/src/main/java/com/ardublock/ui/OpenblocksFrame.java b/src/main/java/com/ardublock/ui/OpenblocksFrame.java
index 4d51673cada65a192008a535b9ea857009e80ece..51e4b56152ecbae4a6573fdf5fd1f8f52654b86a 100644
--- a/src/main/java/com/ardublock/ui/OpenblocksFrame.java
+++ b/src/main/java/com/ardublock/ui/OpenblocksFrame.java
@@ -62,16 +62,16 @@ public class OpenblocksFrame extends JFrame
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = 2841155965906223806L;
-
+	private static final long serialVersionUID     = 2841155965906223806L;
+	private static final int WINDOW_SIZE_WIDTH     = 1200;
+	private static final int WINDOW_SIZE_HEIGHT    = 800;
+	private static final int TOOLTIP_DISMISS_DELAY = 10000;
+	
 	private Context context;
 	private JFileChooser fileChooser;
 	private FileFilter ffilter;
-		
 	private boolean workspaceModeState = false;
-	
 	private ResourceBundle uiMessageBundle;
-	
 	private String appPrefix = "";
 	
 	public void addListener(OpenblocksFrameListener ofl)
@@ -81,8 +81,6 @@ public class OpenblocksFrame extends JFrame
 	
 	public String makeFrameTitle()
 	{
-		//String title = Context.APP_NAME + " " + context.getSaveFileName();
-		//String title = appName + " " + context.getSaveFileName();
 		String title = Context.APP_NAME + " " + appPrefix +" "+context.getSaveFileName();
 		if (context.isWorkspaceChanged())
 		{
@@ -95,7 +93,7 @@ public class OpenblocksFrame extends JFrame
 	{
 		context = Context.getContext();
 		this.setTitle(makeFrameTitle());
-		this.setSize(new Dimension(1200, 800));
+		this.setSize(new Dimension(WINDOW_SIZE_WIDTH, WINDOW_SIZE_HEIGHT));
 		this.setLayout(new BorderLayout());
 		//put the frame to the center of screen
 		this.setLocationRelativeTo(null);
@@ -127,8 +125,7 @@ public class OpenblocksFrame extends JFrame
 		workspace.addWorkspaceListener(new ArdublockWorkspaceListener(this));
 		
 		//display ToolTips for 10 seconds
-		ToolTipManager.sharedInstance().setDismissDelay(10000);
-	
+		ToolTipManager.sharedInstance().setDismissDelay(TOOLTIP_DISMISS_DELAY);	
 		
 		JPanel topPanel = new JPanel();
 		topPanel.setLayout(new FlowLayout());