style changes
last commit before merge to develop