Revert "further code cleanup"

This reverts commit 32e2dab23bdc683e99215720c33805761573c347.
changed Decimal import