merging small style amends