Improve Form check