refactor and restyle
fixing refactor
Merge branch 'refactor' into HEAD