Beautify the code - 1
Merged conflicts