Improve "render" tools function