Cleaned up Warrior.java