little cleanup. Rotation still broken