Refactory routes