Cleanup form and add push script