Rename and format
Rename and format
Reorganise
Fix indent
Rm shift test