* Minor improvements
* Formatting the code