Cleaned up site_url usage