Clean up

* Update documentation (in-source and README)
* Remove redundant variables and files
* Untabify