Removed static access, using Calculator interface, add Luhn shorthand