Cleaned up a few variables in player