Refactor declination