clean up reference/comments