Adding comments and ruby-ifying some conditionals.
* Removing explicit raising of RuntimeError (this is default for the raise method)