Fixed a compiler warning.

Also updated code to match our style.