Feature tidy up routes

Same deal as theodi/people#5