Added axis and minor refactor