local style changes
merge with master