Improve Code readablitity