routing working, clean up