Refactor identification bits and clean up includes and updated for Efficiency correction

Refactor identification bits to use constexpr instead of #define, update includes to comment out unused headers, and improve readability of various functions.

Author: pravatp98