Further method extraction -> major simplification and better debugging.