Code clean up
update to Elixir version 1