Get rid of unnecessary construction.
Correct spacing.