golang support, code cleaning