Resolve merge conflicts
Add better elixir specs
Prefer single-quoted strings when possible