- more style clean up