Clean up code
Add #update and rescue block