Don't check for form submission inside class
A little more refactoring....