Spacing and more code edits