Cleanup and changes integrating with Router