Code tidy
Fixed missing label
Updated for best practices
Merge branch 'calliope' into staging