lazy: Cleanup, Reorder parameters, Rename traits and type parameters