added refactor
Merge branch 'refactor-forum'