updating elements
Merge pull request #52 from WriteOrRead/refactor

updating elements