SimpleForms refactoring