MOre code edits