Cleaned up Form and Field