Formatting code
Fixing playing issues