First fixings of MainDemo and ScoreBoard classes

Adding few comments, formatting the code, renaming of strange variables