General code cleanup
Merge branch 'feature/dan-changes' into develop
Merge branch 'develop'