diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/Assets.java b/src/com/shatteredpixel/shatteredpixeldungeon/Assets.java
index 024e58f61..24469b926 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/Assets.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/Assets.java
@@ -34,7 +34,7 @@ public class Assets {
 	public static final String XP_BAR	= "exp_bar.png";
 	public static final String TOOLBAR	= "toolbar.png";
 	public static final String SHADOW    = "shadow.png";
-	
+
 	public static final String WARRIOR	= "warrior.png";
 	public static final String MAGE		= "mage.png";
 	public static final String ROGUE	= "rogue.png";
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/Bones.java b/src/com/shatteredpixel/shatteredpixeldungeon/Bones.java
index 729fbab91..4e999b84a 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/Bones.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/Bones.java
@@ -186,5 +186,5 @@ public class Bones {
 				return null;
 			}
 		}
-	}
+    }
 }
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/Rankings.java b/src/com/shatteredpixel/shatteredpixeldungeon/Rankings.java
index d6167f7df..594dc9208 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/Rankings.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/Rankings.java
@@ -100,7 +100,7 @@ public enum Rankings {
 		
 		save();
 	}
-	
+
 	private int score( boolean win ) {
 		return (Statistics.goldCollected + Dungeon.hero.lvl * (win ? 26 : Dungeon.depth ) * 100) * (win ? 2 : 1);
 	}
@@ -161,7 +161,7 @@ public enum Rankings {
 
 		}
 	}
-	
+
 	public static class Record implements Bundlable {
 		
 		private static final String REASON	= "reason";
@@ -183,7 +183,7 @@ public enum Rankings {
 		public int score;
 		
 		public String gameFile;
-		
+
 		@Override
 		public void restoreFromBundle( Bundle bundle ) {
 			
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java b/src/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java
index d702fdde1..7131e6fa2 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java
@@ -146,7 +146,7 @@ public class ShatteredPixelDungeon extends Game {
         PixelScene.noFade = true;
         switchScene( c );
     }
-	
+
 	/*
 	 * ---> Prefernces
 	 */
@@ -261,7 +261,7 @@ public class ShatteredPixelDungeon extends Game {
 	public static boolean brightness() {
 		return Preferences.INSTANCE.getBoolean( Preferences.KEY_BRIGHTNESS, false );
 	}
-	
+
 	public static void lastClass( int value ) {
 		Preferences.INSTANCE.put( Preferences.KEY_LAST_CLASS, value );
 	}
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java
index 2d6d5a5b5..a67401eed 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java
@@ -215,7 +215,7 @@ public class Hero extends Char {
 		
 		bundle.put( LEVEL, lvl );
 		bundle.put( EXPERIENCE, exp );
-		
+
 		belongings.storeInBundle( bundle );
 	}
 	
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java
index c22012b33..9a1dcaf71 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java
@@ -171,7 +171,7 @@ public abstract class Level implements Bundlable {
 	private static final String MOBS		= "mobs";
 	private static final String BLOBS		= "blobs";
 	private static final String FEELING		= "feeling";
-	
+
 	public void create() {
 		
 		resizingNeeded = false;
@@ -337,7 +337,7 @@ public abstract class Level implements Bundlable {
 		feeling = bundle.getEnum( FEELING, Feeling.class );
 		if (feeling == Feeling.DARK)
 			viewDistance = (int)Math.ceil(viewDistance/3f);
-		
+
 		buildFlagMaps();
 		cleanWalls();
 	}
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/scenes/StartScene.java b/src/com/shatteredpixel/shatteredpixeldungeon/scenes/StartScene.java
index 669c0c967..317a3d480 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/scenes/StartScene.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/scenes/StartScene.java
@@ -201,7 +201,6 @@ public class StartScene extends PixelScene {
 
         unlock = new Group();
         add( unlock );
-	    
 
         if (!(huntressUnlocked = Badges.isUnlocked( Badges.Badge.BOSS_SLAIN_3 ))) {
 
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java
index c9d142a77..84861980f 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java
@@ -47,15 +47,15 @@ public class ItemSpriteSheet {
     public static final int BONES			= ROW1+4;
     public static final int REMAINS         = ROW1+5;
     public static final int TOMB			= ROW1+6;
-	public static final int GRAVE			= ROW1+7;
-	public static final int CHEST			= ROW1+8;
-	public static final int LOCKED_CHEST	= ROW1+9;
-	public static final int CRYSTAL_CHEST	= ROW1+10;
-	// Placeholders
-	public static final int WEAPON	= ROW1+11;
-	public static final int ARMOR	= ROW1+12;
-	public static final int RING	= ROW1+13;
-	public static final int SMTH	= ROW1+14;
+    public static final int GRAVE			= ROW1+7;
+    public static final int CHEST			= ROW1+8;
+    public static final int LOCKED_CHEST	= ROW1+9;
+    public static final int CRYSTAL_CHEST	= ROW1+10;
+    // Placeholders
+    public static final int WEAPON	= ROW1+11;
+    public static final int ARMOR	= ROW1+12;
+    public static final int RING	= ROW1+13;
+    public static final int SMTH	= ROW1+14;
 
     //Row Two: Miscellaneous single use items
     public static final int GOLD	    = ROW2+0;
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/ui/ExitButton.java b/src/com/shatteredpixel/shatteredpixeldungeon/ui/ExitButton.java
index fa47a9238..54fcbdacb 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/ui/ExitButton.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/ui/ExitButton.java
@@ -27,7 +27,7 @@ package com.shatteredpixel.shatteredpixeldungeon.ui;
 
 public class ExitButton extends Button {
 
-    private Image image;
+    protected Image image;
 
     public ExitButton() {
         super();
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/ui/Icons.java b/src/com/shatteredpixel/shatteredpixeldungeon/ui/Icons.java
index 218bc9e16..816029fbb 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/ui/Icons.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/ui/Icons.java
@@ -53,7 +53,7 @@ public enum Icons {
     CHALLENGE_OFF,
     CHALLENGE_ON,
 	RESUME;
-	
+
 	public Image get() {
 		return get( this );
 	}
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndGame.java b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndGame.java
index 5fe2bd9e0..00d0f3cba 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndGame.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndGame.java
@@ -123,7 +123,7 @@ public class WndGame extends Window {
 				hide();
 			}
 		} );
-		
+
 		resize( WIDTH, pos );
 	}
 	
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndItem.java b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndItem.java
index cd37dd59b..907560330 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndItem.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndItem.java
@@ -45,7 +45,7 @@ public class WndItem extends Window {
 		titlebar.label( Utils.capitalize( item.toString() ) );
 		titlebar.setRect( 0, 0, WIDTH, 0 );
 		add( titlebar );
-		
+
 		if (item.levelKnown && item.level > 0) {
 			titlebar.color( ItemSlot.UPGRADED );
 		} else if (item.levelKnown && item.level < 0) {
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndRanking.java b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndRanking.java
index 59e896012..5dd6d0480 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndRanking.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndRanking.java
@@ -78,7 +78,7 @@ public class WndRanking extends WndTabbed {
 			}
 		};
 		thread.start();
-		
+
 		busy = Icons.BUSY.get();	
 		busy.origin.set( busy.width / 2, busy.height / 2 );
 		busy.angularSpeed = 720;
@@ -102,7 +102,7 @@ public class WndRanking extends WndTabbed {
 			}
 		}
 	}
-	
+
 	private void createControls() {
 		
 		String[] labels =