Rearrange my route code for sanity and great justice