Formatting and re-factoring

* Remove unused code
* Rename strict/lazy functions
* Spacing