fix syntax bug
more style changes