Cleanup code, test ID score on alpha-20