Made the code layout better

Made the code layout better