Code style fixes for patch