Refactoring and implementing form_overrides