Additional code style updates