Tidy up of mainly Art code