Final structural edits