Code style modifications