Fix comments, refactor advertisement