some changes
more style