minor code style changes
merge changes