Updated to Elixir v1.0 syntax