cleaned up hunter rotation indenting and DRYd it up a bit too