Coding style fixes for #321