Minor Changes

* Modified comments
* Removed Magic Numbers