Proper use of url::site(), clean up.'