Alternative fast-generating

A code clean-up