Stars added
Improved code readibility for new comers.
merged