Comments and cleanup. #1200