Improve readability + speed up tests