cleaned up router