Cleanup

Clean routes
combine address checking
close tag at the end