Refactor elements

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