Cleaned up character.java