Refactored elwise
Merge pull request #140 from izaid/elwise

elwise refactoring