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