Remove unnecessary curly brackets
Player style refactoring
Merge remote-tracking branch 'myltsev/master'