Cleaned up the coding style a bit.