Use subs to match keys
Whitespace cleanup
Merge branch 'feature/subs-as-keys' into devel