some code simplification, some removing code duplication, some elixirization
Merge pull request #99 from liveforeverx/more_elixirize

[Proposal] [WiP] More elixirize