[FIX] simplified some math and conversions (develop)