diff --git a/app/src/main/java/at/smartshopper/smartshopper/activitys/Dash.java b/app/src/main/java/at/smartshopper/smartshopper/activitys/Dash.java
index ca43225..2ec7b7b 100644
--- a/app/src/main/java/at/smartshopper/smartshopper/activitys/Dash.java
+++ b/app/src/main/java/at/smartshopper/smartshopper/activitys/Dash.java
@@ -322,7 +322,7 @@ public class Dash extends AppCompatActivity implements ShoppinglistAdapter.OnIte
                 try {
                     MyFirebaseSender myFirebaseSender = new MyFirebaseSender(db.getMembers(sl_idString));
                     myFirebaseSender.addMember(db.getAdmin(sl_idString));
-                    myFirebaseSender.sendMessage(name.getText().toString() + pushEndString +" Von " + db.getUser(username).getName(),name.getText().toString() + pushEndString);
+                    myFirebaseSender.sendMessage(name.getText().toString() + pushEndString + " Von " + db.getUser(username).getName(), name.getText().toString() + pushEndString);
                 } catch (SQLException e) {
                     e.printStackTrace();
                 } catch (JSONException e) {
@@ -745,7 +745,7 @@ public class Dash extends AppCompatActivity implements ShoppinglistAdapter.OnIte
                 try {
                     MyFirebaseSender myFirebaseSender = new MyFirebaseSender(db.getMembers(sl_id));
                     myFirebaseSender.addMember(db.getAdmin(sl_id));
-                    myFirebaseSender.sendMessage("Das Sharing von " + spl.getname() + " wurde von " + db.getUser(FirebaseAuth.getInstance().getCurrentUser().getUid()).getName() + " aufgehoben!",spl.getname() + " sharing wurde geändert!");
+                    myFirebaseSender.sendMessage("Das Sharing von " + spl.getname() + " wurde von " + db.getUser(FirebaseAuth.getInstance().getCurrentUser().getUid()).getName() + " aufgehoben!", spl.getname() + " sharing wurde geändert!");
                 } catch (SQLException e) {
                     e.printStackTrace();
                 } catch (JSONException e) {
diff --git a/app/src/main/java/at/smartshopper/smartshopper/activitys/ItemListActivity.java b/app/src/main/java/at/smartshopper/smartshopper/activitys/ItemListActivity.java
index e6fabec..bf94fc2 100644
--- a/app/src/main/java/at/smartshopper/smartshopper/activitys/ItemListActivity.java
+++ b/app/src/main/java/at/smartshopper/smartshopper/activitys/ItemListActivity.java
@@ -162,7 +162,7 @@ public class ItemListActivity extends Activity implements ItemAdapter.OnItemEdit
         try {
             MyFirebaseSender myFirebaseSender = new MyFirebaseSender(db.getMembers(sl_id));
             myFirebaseSender.addMember(db.getAdmin(sl_id));
-            myFirebaseSender.sendMessage(item.getName()  + " wurde von " + db.getUser(FirebaseAuth.getInstance().getCurrentUser().getUid()).getName() + " gelöscht!","Item: " + item.getName() + " wurde gelöscht!");
+            myFirebaseSender.sendMessage(item.getName() + " wurde von " + db.getUser(FirebaseAuth.getInstance().getCurrentUser().getUid()).getName() + " gelöscht!", "Item: " + item.getName() + " wurde gelöscht!");
         } catch (SQLException e) {
             e.printStackTrace();
         } catch (JSONException e) {
@@ -268,7 +268,7 @@ public class ItemListActivity extends Activity implements ItemAdapter.OnItemEdit
                 try {
                     MyFirebaseSender myFirebaseSender = new MyFirebaseSender(db.getMembers(sl_id));
                     myFirebaseSender.addMember(db.getAdmin(sl_id));
-                    myFirebaseSender.sendMessage(name.getText().toString() + pushEndSting + " Von: " + db.getUser(FirebaseAuth.getInstance().getCurrentUser().getUid()).getName(),"Item: " + name.getText().toString() + pushEndSting);
+                    myFirebaseSender.sendMessage(name.getText().toString() + pushEndSting + " Von: " + db.getUser(FirebaseAuth.getInstance().getCurrentUser().getUid()).getName(), "Item: " + name.getText().toString() + pushEndSting);
                 } catch (SQLException e) {
                     e.printStackTrace();
                 } catch (JSONException e) {
@@ -320,7 +320,7 @@ public class ItemListActivity extends Activity implements ItemAdapter.OnItemEdit
         try {
             MyFirebaseSender myFirebaseSender = new MyFirebaseSender(db.getMembers(sl_id));
             myFirebaseSender.addMember(db.getAdmin(sl_id));
-            myFirebaseSender.sendMessage(item.getName()  + " wurde von " + db.getUser(FirebaseAuth.getInstance().getCurrentUser().getUid()).getName() + " gekauft!","Item Erledigt: " + item.getName() + "!");
+            myFirebaseSender.sendMessage(item.getName() + " wurde von " + db.getUser(FirebaseAuth.getInstance().getCurrentUser().getUid()).getName() + " gekauft!", "Item Erledigt: " + item.getName() + "!");
         } catch (SQLException e) {
             e.printStackTrace();
         } catch (JSONException e) {
diff --git a/app/src/main/java/at/smartshopper/smartshopper/activitys/LoginActivity.java b/app/src/main/java/at/smartshopper/smartshopper/activitys/LoginActivity.java
index dbd2d67..11028c8 100644
--- a/app/src/main/java/at/smartshopper/smartshopper/activitys/LoginActivity.java
+++ b/app/src/main/java/at/smartshopper/smartshopper/activitys/LoginActivity.java
@@ -88,8 +88,8 @@ public class LoginActivity extends AppCompatActivity {
                         String email = user.getEmail();
                         String picture = " ";
                         try {
-                             picture = user.getPhotoUrl().toString();
-                        }catch (Exception e){
+                            picture = user.getPhotoUrl().toString();
+                        } catch (Exception e) {
                             e.printStackTrace();
                         }
                         // Get new Instance ID token
diff --git a/app/src/main/java/at/smartshopper/smartshopper/activitys/ShoppinglistDetails.java b/app/src/main/java/at/smartshopper/smartshopper/activitys/ShoppinglistDetails.java
index 7a41cee..12784b7 100644
--- a/app/src/main/java/at/smartshopper/smartshopper/activitys/ShoppinglistDetails.java
+++ b/app/src/main/java/at/smartshopper/smartshopper/activitys/ShoppinglistDetails.java
@@ -217,7 +217,7 @@ public class ShoppinglistDetails extends Activity implements DetailsAdapter.OnGr
                 try {
                     MyFirebaseSender myFirebaseSender = new MyFirebaseSender(db.getMembers(sl_id));
                     myFirebaseSender.addMember(db.getAdmin(sl_id));
-                    myFirebaseSender.sendMessage(name.getText().toString() + pushEndString + " Von: " + db.getUser(username).getName(),"Gruppe: " + name.getText().toString() + pushEndString);
+                    myFirebaseSender.sendMessage(name.getText().toString() + pushEndString + " Von: " + db.getUser(username).getName(), "Gruppe: " + name.getText().toString() + pushEndString);
                 } catch (SQLException e) {
                     e.printStackTrace();
                 } catch (JSONException e) {
@@ -344,7 +344,7 @@ public class ShoppinglistDetails extends Activity implements DetailsAdapter.OnGr
         try {
             MyFirebaseSender myFirebaseSender = new MyFirebaseSender(db.getMembers(sl_id));
             myFirebaseSender.addMember(db.getAdmin(sl_id));
-            myFirebaseSender.sendMessage(group.getGroupName()  + " wurde von " + db.getUser(FirebaseAuth.getInstance().getCurrentUser().getUid()).getName() + " gelöscht!","Gruppe: " + group.getGroupName() + " wurde gelöscht!");
+            myFirebaseSender.sendMessage(group.getGroupName() + " wurde von " + db.getUser(FirebaseAuth.getInstance().getCurrentUser().getUid()).getName() + " gelöscht!", "Gruppe: " + group.getGroupName() + " wurde gelöscht!");
         } catch (SQLException e) {
             e.printStackTrace();
         } catch (JSONException e) {
diff --git a/app/src/main/java/at/smartshopper/smartshopper/db/Database.java b/app/src/main/java/at/smartshopper/smartshopper/db/Database.java
index d65b702..abe9bbe 100644
--- a/app/src/main/java/at/smartshopper/smartshopper/db/Database.java
+++ b/app/src/main/java/at/smartshopper/smartshopper/db/Database.java
@@ -3,7 +3,6 @@ package at.smartshopper.smartshopper.db;
 import android.os.StrictMode;
 
 import com.google.firebase.auth.FirebaseAuth;
-import com.google.firebase.messaging.FirebaseMessaging;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -104,32 +103,32 @@ public class Database {
 
     private Member generateNewSecureMember(String username, String message_id, String name, String picture, String email) throws SQLException {
         String newusername = "", newmessage_id = "", newname = "", newpicture = "", newemail = "";
-        if(username.isEmpty()){
+        if (username.isEmpty()) {
             newusername = "EMPTY";
-        }else {
+        } else {
             newusername = username;
         }
-        if(message_id.isEmpty()){
+        if (message_id.isEmpty()) {
             newmessage_id = "EMPTY";
-        }else {
+        } else {
             newmessage_id = message_id;
         }
-        if(name.isEmpty()){
+        if (name.isEmpty()) {
             newname = "EMPTY";
-        }else {
+        } else {
             newname = name;
         }
-        if(picture.isEmpty() || picture.equals(" ")){
+        if (picture.isEmpty() || picture.equals(" ")) {
             newpicture = "https://i0.wp.com/www.windowspower.de/wp-content/uploads/2015/10/profilbilde-windows-10.jpg?fit=610%2C340&ssl=1";
-        }else {
+        } else {
             newpicture = picture;
         }
-        if(email.isEmpty()){
+        if (email.isEmpty()) {
             newemail = "EMPTY";
-        }else {
+        } else {
             newemail = email;
         }
-        if(username.equals(newusername)) {
+        if (username.equals(newusername)) {
             if (!name.equals(newname) || !message_id.equals(newmessage_id) || !picture.equals(newpicture) || !email.equals(newemail)) {
                 updateUser(username, newmessage_id, newname, newpicture, newemail);
             }
diff --git a/app/src/main/java/at/smartshopper/smartshopper/messaging/MyFirebaseSender.java b/app/src/main/java/at/smartshopper/smartshopper/messaging/MyFirebaseSender.java
index 85f1c24..241aed8 100644
--- a/app/src/main/java/at/smartshopper/smartshopper/messaging/MyFirebaseSender.java
+++ b/app/src/main/java/at/smartshopper/smartshopper/messaging/MyFirebaseSender.java
@@ -23,8 +23,8 @@ public class MyFirebaseSender {
         messageIds = tmp;
     }
 
-    public void addMember(Member member){
-        if(!messageIds.contains(member.getMsid())){
+    public void addMember(Member member) {
+        if (!messageIds.contains(member.getMsid())) {
             messageIds.add(member.getMsid());
         }
     }
@@ -34,7 +34,7 @@ public class MyFirebaseSender {
      * Sendet die Firebase Messages zum server
      *
      * @param message Push Nachricht
-     * @param title  Push title
+     * @param title   Push title
      */
     public void sendMessage(String message, String title) {
         message = message.replace(" ", "%20");
@@ -55,10 +55,10 @@ public class MyFirebaseSender {
                 HttpClient httpclient = new DefaultHttpClient();
                 HttpGet httpGet = new HttpGet("https://www.smartshopper.cf/push/" + messageIds.get(i) + "/" + message + "/" + title);
 
-                    // Execute HTTP Post Request
-                    HttpResponse response = httpclient.execute(httpGet);
-                    Log.d("SmartShopper", "Message ID: " + messageIds.get(i));
-                    Log.d("SmartShopper", "Response Push Post: " + response);
+                // Execute HTTP Post Request
+                HttpResponse response = httpclient.execute(httpGet);
+                Log.d("SmartShopper", "Message ID: " + messageIds.get(i));
+                Log.d("SmartShopper", "Response Push Post: " + response);
 
             } catch (Exception e) {
                 e.printStackTrace();