code style improvements according to hound
Merge branch 'staging' into 961-folder_creation