Some refactors I noticed when reading through the code

Pretty nicely written, I didnt actually test these. But I think they are sane. Nice project, im going to use it later.
Merge pull request #36 from gtsafas/patch-2

Some refactors I noticed when reading through the code