Refactor code section
Merge branch 'staging'