Refactor a bit
BigNumber fix