styling changes
merging master