Minor clean up -- move large single use method out of header(NFC)