Refactoring
More privates and extracting score drawing