Put the tank in a seperate class and added comments here and there for clarity