Cleaning up some stuff, simpler router