diff --git a/app/src/main/java/com/erz/joystick/GameLoop.java b/app/src/main/java/com/erz/joystick/GameLoop.java
index a684e6a..f3e737d 100644
--- a/app/src/main/java/com/erz/joystick/GameLoop.java
+++ b/app/src/main/java/com/erz/joystick/GameLoop.java
@@ -7,7 +7,7 @@ import android.view.SurfaceView;
  * Created by edgarramirez on 7/17/15.
  */
 public class GameLoop extends Thread {
-    private static final long FPS = 60;
+    private static final long FPS = 24;
     private static final long ticksPS = 1000 / FPS;
     private SurfaceView view;
     private boolean running = false;
diff --git a/app/src/main/java/com/erz/joystick/GameView.java b/app/src/main/java/com/erz/joystick/GameView.java
index 0b515c8..c563793 100644
--- a/app/src/main/java/com/erz/joystick/GameView.java
+++ b/app/src/main/java/com/erz/joystick/GameView.java
@@ -7,7 +7,6 @@ import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.RectF;
-import android.support.annotation.NonNull;
 import android.util.AttributeSet;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
@@ -20,61 +19,55 @@ import java.util.Vector;
  */
 public class GameView extends SurfaceView implements SurfaceHolder.Callback {
 
+    private int i;
+    private int size = 20;
+    private int minSpeed;
+    private int maxSpeed;
+    private int minRadius;
+    private int maxRadius;
     private float width;
     private float height;
     private float posX;
     private float posY;
     private float radius;
-    private GameLoop gameLoop;
-    private Paint paint;
-    private Random random = new Random();
-    private int i;
-    private int size = 20;
-    private int maxRadius;
-    private Bitmap droid;
-    private RectF rectF;
-
     private double angle;
     private double power;
-
     private double angle2;
+    private Bitmap droid;
+    private GameLoop gameLoop;
+    private Paint paint;
+    private Vector<Star> stars = new Vector<>();
+    private RectF rectF = new RectF();
+    private Random random = new Random();
 
-    private Vector<Star> stars;
+    public GameView(Context context) {
+        this(context, null);
+    }
 
     public GameView(Context context, AttributeSet attrs) {
         super(context, attrs);
-        init();
-    }
-
-    public GameView(Context context) {
-        super(context);
-        init();
-    }
-
-    private void init() {
         getHolder().addCallback(this);
         paint = new Paint();
         paint.setAntiAlias(true);
+        paint.setFilterBitmap(true);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(Color.WHITE);
         droid = BitmapFactory.decodeResource(getResources(), R.drawable.droid);
-        rectF = new RectF();
     }
 
     @Override
-    public void draw(@NonNull Canvas canvas) {
+    public void draw(Canvas canvas) {
         if (canvas == null) return;
-        super.draw(canvas);
         canvas.drawColor(Color.BLACK);
 
         if (stars != null && stars.size() > 0) {
             for (i = 0; i < size; i++) {
-                stars.get(i).draw(canvas, paint, height, maxRadius);
+                stars.get(i).draw(canvas, paint, rectF, random, minSpeed, maxSpeed, minRadius, maxRadius, width, height, maxRadius);
             }
         }
 
-        posX -= Math.cos(angle) * (power / 2);
-        posY += Math.sin(-angle) * (power / 2);
+        posX -= Math.cos(angle) * power;
+        posY += Math.sin(-angle) * power;
         if (posX > width - radius) posX = width - radius;
         if (posX < radius) posX = radius;
         if (posY > height - radius) posY = height - radius;
@@ -108,23 +101,16 @@ public class GameView extends SurfaceView implements SurfaceHolder.Callback {
         radius = min / 12;
         rectF = new RectF(posX - radius, posY - radius, posX + radius, posY + radius);
 
-        int minSpeed = (int) (min / 75);
-        int maxSpeed = (int) (min / 25);
-
-        int minRadius = (int) (min / 250);
+        minSpeed = (int) (min / 37);
+        maxSpeed = (int) (min / 12);
+        minRadius = (int) (min / 250);
         maxRadius = (int) (min / 220);
 
         if (maxRadius == minRadius) maxRadius += minRadius;
 
-        stars = new Vector<>();
+        stars.clear();
         for (i = 0; i < size; i++) {
-            int tmpRadius = random.nextInt(maxRadius - minRadius) + minRadius;
-            int maxX = width - tmpRadius;
-            int maxY = height - tmpRadius;
-            stars.add(new Star(random.nextInt(maxX - tmpRadius + (maxRadius * 4)) + (tmpRadius - (maxRadius * 4)),
-                    random.nextInt(maxY - tmpRadius + (maxRadius * 4)) + (tmpRadius - (maxRadius * 4)),
-                    random.nextInt(maxSpeed - minSpeed) + minSpeed,
-                    tmpRadius));
+            stars.add(new Star(random, minSpeed, maxSpeed, minRadius, maxRadius, width, height));
         }
     }
 
diff --git a/app/src/main/java/com/erz/joystick/MainActivity.java b/app/src/main/java/com/erz/joystick/MainActivity.java
index ba59daf..6a7648a 100644
--- a/app/src/main/java/com/erz/joystick/MainActivity.java
+++ b/app/src/main/java/com/erz/joystick/MainActivity.java
@@ -8,7 +8,7 @@ import com.erz.joysticklibrary.JoyStick;
 
 public class MainActivity extends AppCompatActivity implements JoyStick.JoyStickListener {
 
-    GameView gameView;
+    private GameView gameView;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
diff --git a/app/src/main/java/com/erz/joystick/Star.java b/app/src/main/java/com/erz/joystick/Star.java
index b95c56c..f40cd84 100644
--- a/app/src/main/java/com/erz/joystick/Star.java
+++ b/app/src/main/java/com/erz/joystick/Star.java
@@ -4,6 +4,8 @@ import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.RectF;
 
+import java.util.Random;
+
 /**
  * Created by edgarramirez on 6/16/15.
  */
@@ -13,33 +15,35 @@ public class Star {
     private float speedY;
     private float radius;
     private boolean ready = false;
-    private RectF rectF;
 
-    public Star(float x, float y, float speedY, float radius) {
-        this.x = x;
-        this.y = y;
-        this.speedY = speedY;
-        this.radius = radius;
-        ready = true;
-        rectF = new RectF();
+    public Star(Random random, int minSpeed, int maxSpeed, int minRadius, int maxRadius, int width, int height) {
+        reset(random, minSpeed, maxSpeed, minRadius, maxRadius, width, height);
     }
 
-    public void draw(Canvas canvas, Paint paint, float height, float max) {
+    private void reset(Random random, int minSpeed, int maxSpeed, int minRadius, int maxRadius, int width, int height) {
+        int tmpRadius = random.nextInt(maxRadius - minRadius) + minRadius;
+        int maxX = width - tmpRadius;
+        int maxY = height - tmpRadius;
+        this.x = random.nextInt(maxX - tmpRadius + (maxRadius * 4)) + (tmpRadius - (maxRadius * 4));
+        this.y = random.nextInt(maxY - tmpRadius + (maxRadius * 4)) + (tmpRadius - (maxRadius * 4));
+        this.speedY = random.nextInt(maxSpeed - minSpeed) + minSpeed;
+        this.radius = tmpRadius;
+        ready = true;
+    }
+
+    public void draw(Canvas canvas, Paint paint, RectF rectF, Random random, int minSpeed,
+                     int maxSpeed, int minRadius, int maxRadius, float width, float height, int max) {
         if (!ready) return;
-        update(height, max);
+
+        y += speedY;
+
+        if ((y + radius) > (height + (max * 4))) {
+            reset(random, minSpeed, maxSpeed, minRadius, maxRadius, (int) width, (int) height);
+        }
 
         rectF.set(x - radius, y - radius, x + radius, y + radius);
 
         paint.setStrokeWidth(radius / 10);
         canvas.drawOval(rectF, paint);
     }
-
-    public void update(float height, float max) {
-        if (!ready) return;
-        y += speedY;
-
-        if ((y + radius) > (height + (max * 4))) {
-            y = - (max * 4) - radius;
-        }
-    }
 }
\ No newline at end of file