Rendering of helper code improved