Code style cleanup!