upgrade to Elixir 0.15.1, clean up code a bit