Cleaned up axis computation code