Some code style changes for project