Code style changes