Cleaned up edit handlers