General maintenance

- removed unnecessary mixins
- minor alterations to functions
- improved comments across the board