cleaned up routs