clean up and more style chagnes