Code tidy and proper add and remove graphics