cleaned up form