* Code cleanup
* Fixed score logic
* Other minor changes