axis refactoring

axis refactoring