* Added Comments
* Slight refactoring