More cleanup, clarity in function names.
Spacing.