Cleanup, bug fix on Xaxis