General refactor #65

Refactor

For the sake of code quality, the code needs to be reviewed, refactored, cleaned, enhanced and optimised where possible.
This description is somewhat abstract, but after such a long time without reviewing the codebase, it's useful to bring ourselves up to date and see what kind of improvements we can make to the library.