Cleaned up form actions
Cleaned up