* Code Re-formatting
* Remove unnecessary comment