Refactored form action service