Refactor for non-destructive style attribute logic in Update() method. Fixes #18