* small style optimizations and corrections