Comment fixes & IDE highlighted cleanups