Fix whitespace. Move in first code from old prototype.