Style fixes, simplification and speedup (+ 50%), more symbols exported