some comments cleaned up