Small code style changes