Fix comment
Improve form abstract