Cleaned up edits