Beautifying Code

Update:
1. Making the code more beautiful and easier to read.