URL callback now working - fixes #5
Code cleanup