Playground refactoring