Improve calc command

Signed-off-by: Emilien Kenler <hello@emilienkenler.com>