Code style cleanup
Bug fix