Finish refactoring sliding piece
Merge branch 'more_refactoring'