refactoring, cleanup and score funktions