Collapsed back into single line... cleaner?