Update code based on derivative site
Update code based on Styleguide
Merge branch 'feature/refactor' into develop