Update: rendering cleanup