ps -> playing_surface
more name refactoring
general refactor and cleaning