Style changes
Redundant namespace indentation removed
Model refactoring
Basic players