Elfjar

Tiny cleanup of #202