Some code edits