Made a bunch of local helpers private
Updated routes (untested)