Fixed coding style, and made some other suggestions.