Clean up a little.
Merge branch 'feature/configurable-identifier' into develop