cleanup comments, test code