Cleaned up TODO detection and marking