Re-factor
[06] Points calculator