shorten tanks code even further