Migrated PR https://github.com/kipusoep/UrlTracker/pull/29/files + small cosmetic fixes