Cleaning up some comments from berker