Added multi-line comments

* Simplified code