Refactoring run. Mostly spacing and comments.