Splitted the logic for the drawing of the tank and the tank itself.