refactor - simplify main class
showing
wp