Additional tank cleanup

This class needs needs work. It has too many long methods, and uses
javadoc comments within methods, which is confusing.