removed extra comments, modified destroy and update methods