Code style/cleanup