updated stylings
merged