cleanup for extraced classes
SubmitAction refactored too, and made results parsing cleaner