Refactor methods and add to score