Moved scoring methods; WILL break build

* Removed ALL ;'s to improve readability
* Updated docs