Miscellaneous cleanup

* Replaced "is not" with "!="
* Cleaned up if-statement trees
* Removed dependency for "time" package
Merge pull request #22 from FenrirUnbound/fix/tidy-up

Miscellaneous cleanup