Cleanup

Cleanup on code, checked href’s on nor sites