Improved cuke comments; Removed 1 un-needed TODO