remove comments, move URLs to class vars