Simplify slightly.
Make whitespace consistent.