TextField cleanup
Merge pull request #965 from seroperson/master

TextField cleanup