Superficial clean up edits