Refactor elements

Based on #12 --> Relevant commit: 6b772fd