Remove ImagePage comments
Move UrlGenerator construction to separate method

Move UrlGenerator construction to a separate method.