Was always using smallest scaling factor due to wrong code ordering
* Move entry point macros to separate header * Minor code cleanup * Updated macos CI