small refectorings, no using lastRendercommands