Added character and cleaned up player class