Small code style updates and fixes