Refactor suggestions

[RoelN]

A collection of things to improve, better practices, and things that could be tidied up:

• Import axis instead of using strings discussion