Form edits all around for consistency