Improve Code Layout