Cleaned everything up.  Created a Player class.