[Comment] Gustaf bug fix: rm comments and improve variable init.