Some edits on Pedro Code