cleanup untyped, cleanup Math, add native Math class