code cleanup via code review (formatting, comments, proper url abstracting)