cleanup style
tidy more style