Some more code style updates