Made the code beautiful