Move update call to a method
Remove test blocks