Some small changes to the z-axis part and did some cleaning up