first style adaptions
a few Style modifications