Credit Andrea improved comments in render format