Update and clean Widget Class