cleanup and work on router