Minor refactorings
Added player class