Code beautification
Made x-axis creation a little smarter