cleaned up axis logic
ocd