Reorganize. Fix whitespace.