further cleaned up numerical standards