Small code style updates