Handicap calculation tidyups