Code clean up

Just some code improvements.
115 out of 127 unit tests are passing. The other 12 tests are because I
couldn't find proper Team-Ids or didnt play some specific champions (For
example with ID 28)

Please re-run the unit tests befor merging this :)