AHRS Refactoring