Making this more sane to maintain.