cleaned up edit forms