Simplification / Optimization of Aquarium class.