Several edits with code pro