Simplify super call
Fix syntax
simplify loop to a while