Reordered some calls for better performance and cleared form values after successful save