some code style changes