Fix semicolons
Simplify url callbacks