gras: code cleanup and comments from last commit