Code style updates