Remove some print staements
Handle the axis shift error
Style fixes