Some cleanup, new all() method