more style updates & simplification