General cleaning of teh code, and added scores