Cleaning up router to turn into package