refactoring: coupled translation and rotation
fixed zealous warnings