Major Code Cleanup + yAxis Label